am ef02ec9e: (-s ours) am d4f0ffcb: Merge "Adopt the new prebuilts/ndk/<number> paths." into jb-mr1-dev

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