Merge "Refactor the ISoundDose.aidl interface"