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

Change-Id: I962799022b85fdfb7c5adef0c30ff5e2e74a3eaf