Merge "OBEX: Fix PrivateOutputStream small write problem"