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

Change-Id: I781587bacb5fb165d54d42bf7c8a87db7ef322f1