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

Change-Id: I52741bf4e4d37a93f4a4526c340f4a83d58499dd