Port to android studio platform
Merge branch 'AndroidStudio'