Merge "Avoid adb root during TranscodeTest" into sc-dev