Update makefiles. am: f99ae5a628 am: 45f22fb9bb
am: a9e57d346a

Change-Id: I0763e4abe8c6eacddec91e89ee11810cb707572a