Merge "Remove keymaster HIDL entry in compat matrix."