Merge "Use simplified update-makefiles.sh script." am: 04ff4a07eb
am: b235c400d0

Change-Id: Ia04cc3e61d0a6792f9265c44569ccbfd0c706edd