adding ANDROID_HOME and correct paths; added default git diff and mergetool