Properly added the android branch
Merge branch 'android_branch'
This is actually the previous merge