Merge "remove unused code from PerformAdbRestoreTask"