Merge "removed toybox_static (and modprobe) from normal mode"
am: 78605fcb21

Change-Id: Idbf35653565bbbcbaa6b3679ceae5f63171a32ff