Merge "Revert fs-verity for all APKs"