Merge "Update makefiles."
am: 95084fc0a5

Change-Id: I4ab0f52429ec48a3fbc3168a4cb6b2e4d1f54702