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

Change-Id: I40076615df8cd0b520f19c496e5d8ee8de5f6094