Update makefiles.
am: e4d318948a  -s ours

Change-Id: I3bc995be0dbcaedceac63f9dee9120288a84a2e4