Merge "Factor out common code for APK and APEX backups."