Merge "Update makefiles from anywhere."
am: a24592b396

Change-Id: I48f496f85a7da83e4506634ee9b90792471fac6c