Merge "Add support for key-value packages to adb backup/restore."