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

Change-Id: I9955f380c0193eea987e85a6d9ca9bbd27e542c0