Merge "Update makefiles."
am: b35c23e70c

Change-Id: I297b14fdb0971efcbacf301f8527fd469b33cc14