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

* commit '3bc200de51c0afc6f954aaba5d029e1fb4d115e7':
  Replace deprecated APIs in NDK samples