Merge "Annotate JNICALL with __NDK_FPABI__"