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

Change-Id: Ifcb257ddce0e7d7c3f5d37f75c9af5ce6aa04cb4