Merge "SDK Launcher support sdk\tools\android.bat"