am 8e938888: am a77377be: Merge "Annotate JNICALL with __NDK_FPABI__"

* commit '8e938888b8908bd7a78fe6511665d61944a15b9d':
  Annotate JNICALL with __NDK_FPABI__