resolved conflicts for merge of db38d10a to lmp-mr1-dev-plus-aosp

Change-Id: I81b1fa2c3014abee75a32e82202b3f6b18435c9b
diff --git a/toolbox/Android.mk b/toolbox/Android.mk
index c1b9f68..8783abf 100644
--- a/toolbox/Android.mk
+++ b/toolbox/Android.mk
@@ -153,13 +153,11 @@
     id \
     ifconfig \
     iftop \
-    insmod \
     ioctl \
     ionice \
     load_policy \
     log \
     ls \
-    lsmod \
     lsof \
     md5 \
     mkdir \
@@ -172,11 +170,10 @@
     nohup \
     notify \
     ps \
+    prlimit \
     readlink \
     renice \
     restorecon \
-    prlimit \
-    rmmod \
     route \
     runcon \
     schedtop \