am a77377be: Merge "Annotate JNICALL with __NDK_FPABI__"

* commit 'a77377bed68bf363019d966788b06a2ca22a6683':
  Annotate JNICALL with __NDK_FPABI__