am 2904af32: am 348f8889: Merge "Add missing __NDK_FPABI__ to function taking/returning float/double"

* commit '2904af32e879ef15c22f6329799e6c25a5bda624':
  Add missing __NDK_FPABI__ to function taking/returning float/double