Merge "Fix old clearkey builds after aidl refactor"