Merge "Ran update-makefiles.sh."
am: 891f6a946a

Change-Id: I4fba97b1fd1c2d49f603ad83570fad640ef5fb7e