Revert "Fix --block"

This reverts commit 5a1c2a4317e4cc308c5b6032ccefeb4bd1e56ccc.

Change-Id: I8f7a74a06482730b2d94fc8197429cce45de5fe9
Slimify a few scripts

Change-Id: I924bc6529def277e72d9931134e77e610b92f6ea
Re-enable backuptool for SLIM_BUILD's

Change-Id: I2a392417a45094b826b1c2745680ba25f689b2ad