Merge "Cleanup DM makefile to no longer depend on HWUI."