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

Change-Id: I25d606f401dbf3947fac3ef4c8ae9d71c30cc780