Merge "Adopt the new prebuilts/ndk/<number> paths." into jb-mr1-dev