backuptool: Add support for cross-version whitelists

Change-Id: I415eb4d64d693a7e150656802be7f7c4a0e5ab8b
otablock: also disable BroadcastReceiver

otherwise it'll prevent the device from going to sleep

Change-Id: I56e20c4b3e33c78f30e095f38240d6663c9d74f5

Conflicts:

	prebuilt/common/bin/otablock