Update makefiles.
am: e90c31f125

Change-Id: I370a9a20b005d7510463594b24e5c4fc8791116a