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