am 4c86b6ec: (-s ours) Adopt the new prebuilts/ndk/<number> paths.

* commit '4c86b6ec1a905e46f2a575ac0851ec5f153a4acf':
  Adopt the new prebuilts/ndk/<number> paths.