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

Change-Id: Iaa639676ec5d42e778333650fd4ac6d9f43beef5