Merge "Disambiguate fs-verity and apk-verity"