Added android path
Merged and solved conflicts