fix build files for android studio 1.0
Merge pull request #2087 from wordpress-mobile/issue/android-studio-1.0

fix build files for android studio 1.0
Merge branch 'release/3.5' into develop