Merge "Allow makefiles to be parsed in a trimmed down manifest."