merge in jb-mr1-release history after reset to jb-mr1-dev
diff --git a/rootdir/init.rc b/rootdir/init.rc
index a32cb93..d3030e4 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -5,8 +5,8 @@
 #
 
 import /init.usb.rc
-import /init.trace.rc
 import /init.${ro.hardware}.rc
+import /init.trace.rc
 
 on early-init
     # Set init and its forked children's oom_adj.