am e06e961c: am 7edec14c: Merge "Set BUILDING_WITH_NINJA flag when parsing makefiles for ninja build"

* commit 'e06e961cc69b48e562f42464d4db0adc2b8d81d9':
  Set BUILDING_WITH_NINJA flag when parsing makefiles for ninja build