Merge "Merge "Stop packing system/update_engine/scripts." am: d994b4c062 am: 22fa2f20ae am: b5de826520" into qt-r1-dev-plus-aosp