Merge "Update makefiles."
am: a597fa9a8d

Change-Id: I8060114d6cc541c59b6909fac69cadd9f0463798