Update makefiles. am: f99ae5a628
am: 45f22fb9bb

Change-Id: I0146e55d12394145c7fe0d195d115faf7fd62a75