Merge "[DO NOT MERGE] Clean up sandbox and letterbox ADB debug commands" into sc-v2-dev