Merge "Ports DiffScriptBackupWriter from gmscore to AOSP."