revert 2 aidl changes