am d7eb96c5: (-s ours) am 73f34086: Merge "Always use the NDK for unbundled branches."

* commit 'd7eb96c5b47d693c40c8c744f77f9c45ac3188b8':