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

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