Merge "CTS: Move vm-tests mains.jar generation to soong" am: eda73ff184
am: e272496134

Change-Id: Idef7f30b4d62b8ef66328a684902b059ad1d9d98