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

Change-Id: I8901156699fa2e3d8f4d22b89cff85a5249ea330