Merge "Update makefiles."
am: 9119d4ccd1

Change-Id: Icf060b16975695c0d8b6bbf2ba2d20f1c728eb65