Merge "Update makefiles." am: 2f3c139981 am: 464839dc43
am: a3beee1be9

Change-Id: I5ff7f3a71d3b2ae503f347ffd50b94797dc92a7e