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

Change-Id: Ic745f9bd08c20c408e21459616bdf42e688f9d28