Merge "Update makefiles from anywhere." am: a24592b396 am: 1ad1c673db
am: 40699c4d25

Change-Id: I8ac3efdf6efa470fc21d301ecb2410ef22f85337