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

Change-Id: I6920beeea54cf86f1ae3e2bbfac1158d43094bb4