am 3bc014a6: am 69845974: Merge "Add __NDK_FPABI__ to function taking/returning float/double"

* commit '3bc014a6abc7d9569d2ff18a9fd076c5c8fbd058':
  Add __NDK_FPABI__ to function taking/returning float/double