Merge "update-makefiles.sh"
am: dcec84e96c

Change-Id: If6fcacee6314035e217d291c231c06320f4ab21e