Merge "Remove old dumpstate aidl methods"