Merge "Update makefiles from anywhere."
am: e5091993a7

Change-Id: I0be7f703ef9a5364dcc8c67c1e7d7dd45aed8529