Merge "Update makefiles." am: a597fa9a8d am: 7794db5bd2
am: 9273d0f7ea

Change-Id: I80fe31b413b6e93aae8232932978ebfe92ea9fd5