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

Change-Id: Ib921f66a7b5674f892959f9b525f80edc8cb825d