Merge "clearkey aidl: misc fixes"