Added vim->vi redirect
Changed android-sdk path