Merge commit 'b2042f7263c7bbacc5115de4a42c5a96b64a06f2' into HEAD
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 8ba7c10..9093b54 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -309,6 +309,8 @@
     # the following directory.
     mkdir /data/mediadrm 0770 mediadrm mediadrm
 
+    mkdir /data/adb 0700 root root
+
     # symlink to bugreport storage location
     symlink /data/data/com.android.shell/files/bugreports /data/bugreports