Merge "Fix armv5te-vfp build." into dalvik-dev