Update makefiles. am: e90c31f125 am: f11981de68
am: 103bada0e1

Change-Id: Ibe6eeeacab5660a8cf70d59dd9a4864d6f70ab80