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

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