Update makefiles. am: e90c31f125
am: f11981de68

Change-Id: Icf25d969d83dff9653435d5fff0edb6b274a9d9f