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

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