Busybox 1.21.0 squashed commit for gingerbread

Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>

Change-Id: I098009c771c217ec9851a9ecc1096f8ddcb92f74
Merge remote-tracking branch 'cm/gingerbread' into gingerbread