Yeah. In my mind whether it is acrobatics or athletics really depends on how he does it. Hauling himself or climbing up the side of the building is Athletics. Flipping up onto the roof like Caelyn did is Acrobatics. Likewise, she was distracted and tried a straight up jump to the other building, whereas a running vault/flip like you see in the gymnastics floor exercise would have been acrobatics (something she is much better at). Of course, this way is much more humorous and advances the story.
EDIT: just saw your edited post, that's not going to be enough for a harmless landing on the ground, but will make it easy and just say 2 points of damage from the fall.