Merge "Fixed ErrorState.aidl to include int backing."