Merge "Require keymaster4 attestations to contain the right version." into pi-dev