am bef6ec84: am 3bc200de: am 9864b880: Merge "Replace deprecated APIs in NDK samples"

* commit 'bef6ec841ec7358dc09d564f0e38a9cb9f933293':
  Replace deprecated APIs in NDK samples