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

Change-Id: I947819188949b34426b4766d64943f8d5ce96742