Merge "Remove floating point register cruft." am: a4aab526 am: c9dda75f...

Merge "Remove floating point register cruft." am: a4aab526 am: c9dda75f am: 7fb20c72 am: 66e0e8bb

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2494341



Change-Id: I5bb46754a09bf7851d2353894e22187bcb702b00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>