Merge "Move GetAndroidToolsDir to common location."