Merge "Makefile cleanup/fix after refactoring." am: 5b8f4e952f am: 062ff613d6
am: 98b23ef609

Change-Id: I60c609842aaca44b19b56a0f16090b7cc9eb7118