Merge "KeyMint AIDL tweaks"