Fix IWindowSession.aidl merge