Update makefiles. am: 69fa1faddd am: 78cefb9454
am: 6dd991cc9a

Change-Id: I1f26b2e13faa92dbaf4f39d61a09835bcd4bf139