[automerger skipped] Merge "pack VTS cc_test binaries as general-tests" am: d6fe421895 am: 4ea1fa9f72
am: bfeaa2c507  -s ours

Change-Id: I1b1a2d223407a2bc5f7c4f7703a6fe8b70eca21a