am 4bbf8fae: am 6d20af03: Merge "Use the same build.ninja for normal make targets"

* commit '4bbf8fae1605964b53d32d54db31fbd29db473e7':
  Use the same build.ninja for normal make targets