am 50c5ce01: Merge "Force ARMv7 builds to use only 16 FP registers." into eclair

Merge commit '50c5ce01ca7985b6a76ef67cf171a6eb29c69b80' into eclair-plus-aosp

* commit '50c5ce01ca7985b6a76ef67cf171a6eb29c69b80':
  Force ARMv7 builds to use only 16 FP registers.