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

Change-Id: If4910a9f526c2e9050a12ecf2e9ab7fdcdf55577