Merge "Add TEST_MAPPING for ApkVerityTest"