Merge "Move ApkVerityTest to presbumit"