am 73f34086: Merge "Always use the NDK for unbundled branches."

* commit '73f340863693dd5394082251f4fba8ce4f70c2d0':
  Always use the NDK for unbundled branches.