Merge "Allow makefiles to be parsed in a trimmed down manifest."
am: 7b50fc4bef

Change-Id: I345b2a9b9dc412eca7fb7eb22970e3d75a7dc068