Update makefiles. am: a6c5ff2c6d am: 19fda75273
am: 66477194a4

Change-Id: Ibd056d86f726c70e08a2db0c29f75fd10ae0648d