Merge "ndk: Fix GB x86 definitions for libm.so"