Merge "adb: remove workaround for b/6558362."