Merge "Update makefiles from anywhere." am: e5091993a7
am: e8c03d56eb

Change-Id: I16f40b73c11d3d081cefaa2949901a8ee2288b82