Merge "Always use the NDK for unbundled branches."