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

Change-Id: Iba423799a31fcdc71600c8da45b26c79f265939e