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

Change-Id: I3b1565e7b26a2ab215ff30bc9110df436899a07a