Merge "Update makefiles."
am: 2f3c139981

Change-Id: I2ad21e8fcf1f1914bb6e7d7b741e32552c69c246