Add android sdk to path
Fix conflicts