Merge "Revert "adb: create shell protocol class.""