Merge "adb: windows: fix adb execute root cmd with no tips" am: 02f535f582 am: a35a2e21c2

Change-Id: Idc502020d9c729dc0206e6f9b714a1a46eab27d1