Merge changes I7db582ac,Ie68b88c4

* changes:
  Sign MicrdroidTestApp using APK sig scheme V4
  Move test apk out of the virt apex