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

Change-Id: I746d0ed39a96fabb4b79eacf9a289e2485ca1fc3