Update makefiles.
am: 8746d80da8

Change-Id: I911fd6d2f93b033c13d815e5e007fcbc5c3aac23