Merge "Add a wipe-data command to gsi_tool and IGsiService." am: 829e252fd6
am: 21d47cd444

Change-Id: I79954247c7efbc0e8be2ae47d96c71caf6ec66be