Merge "update-makefiles.sh" am: dcec84e96c am: 1eed5f2d5d
am: 238c76ee22

Change-Id: Ibc5871e70fb648c823623ca47990dd7c041dc987