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

* commit '9ee891e3024399c0d0ea0d44d2997cdf357f2d30':
  Fix NDK API on old devices.