Update makefiles.
am: a6c5ff2c6d

Change-Id: I624ec8f0956cbfcd7d461e245d8121919f441167