x64-upstream: Solve adb install issue
x64-upstream: Rebase to 268372