Merge "Pack system/update_engine/scripts into otatools.zip." am: 27bfc86d8b
am: cdfabdbf85

Change-Id: Ifbf47be3c9330fb984907b257612b2f7b9f25d2f