Merge "pack VTS cc_test binaries as general-tests"
am: d6fe421895

Change-Id: I2d7b32c18f8eea87f6f03194ab4b859c9238030f