Merge "Set BUILDING_WITH_NINJA flag when parsing makefiles for ninja build"