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

* commit 'a230f472ffd8664776a0c8741cf1b7c8cdd0a272':