backuptool: Add support for cross-version whitelists

Change-Id: I415eb4d64d693a7e150656802be7f7c4a0e5ab8b
Prevent stock OTA activities from running in CM

Change-Id: I3f586cd246fc351afb82c94f41329bf930f6f41a
otablock: Disable only the actual activity, leave the service on

This is apparently shutting down uncleanly and frequently leaving
unwanted stuff active :(

Change-Id: I08e7b28adf1ec0725b82357df96beda2527e2f16
Merge remote-tracking branch 'cm/cm-10.2' into TheROM43