Merge "keystore2: cope with KeyMint AIDL V2"