Merge "Update makefiles." am: 95084fc0a5 am: 2ee28a513b
am: 104370f6a8

Change-Id: Iccebeccbb0ba4f94fe6b42db820d2688615e53b5