Merge "Remove UsbStorageActivity, which is no longer used."