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

Change-Id: I9899eb544f48e4556117b4c83153a76a3ef72cb9