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

Change-Id: I41547713cd93c9996d81bf0c37cd1879340f4d49