am 517393a3: (-s ours) am 0898d372: Merge "Remove broken vfp_alias.S implementation."

* commit '517393a39b64cdc18bb852be00d5bec236db906a':