am 3d18af5a: (-s ours) am d0c9b3f3: Revert "Remove broken vfp_alias.S implementation."

* commit '3d18af5aafc646cf0646712334e7379a0fe22315':