Merge "Rewrite testBadApkOnly (1/n)" into rvc-dev am: 0cb85d1a am: c91ef2c2 am: bd17ca36 am: a5919a39 Change-Id: If1fc41839702dbad141bdaf12947218c7c0c45e4