am a9861e8f: am 9ee891e3: am f171923b: Merge "Fix NDK API on old devices."

* commit 'a9861e8fe76a0252c0b5105c4796590f988a1030':
  Fix NDK API on old devices.