Merge "Update makefiles." am: bbf39eb0b9 am: 3334081377
am: 5306d88cad

Change-Id: Ie1ed999a4a11ea9767d09fca591c80db91102daf