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

Change-Id: I8ce6c7a937b28cb93c7bd6831a69042f18cce04a