am 4423567b: Always use the NDK for unbundled branches.

* commit '4423567b8e66b497731db479a02a606616ee0b1e':
  Always use the NDK for unbundled branches.