am fa5f2ad4: am bd8f4a85: Merge "Define O_BINARY for non-Windows platforms."

* commit 'fa5f2ad48b0a22d963b11b87cb94d5d1960c42ff':
  Define O_BINARY for non-Windows platforms.
diff --git a/rootdir/ueventd.rc b/rootdir/ueventd.rc
index 616566e..b534669 100644
--- a/rootdir/ueventd.rc
+++ b/rootdir/ueventd.rc
@@ -70,6 +70,7 @@
 /dev/qmi1                 0640   radio      radio
 /dev/qmi2                 0640   radio      radio
 /dev/bus/usb/*            0660   root       usb
+/dev/usb_accessory        0660   root       usb
 
 # CDMA radio interface MUX
 /dev/ts0710mux*           0640   radio      radio
@@ -79,4 +80,4 @@
 # sysfs properties
 /sys/devices/virtual/input/input*   enable      0660  root   input
 /sys/devices/virtual/input/input*   poll_delay  0660  root   input
-
+/sys/devices/virtual/usb_composite/*   enable      0664  root   system