Update file references in Android projects.
Merge pull request #352 from hardye/android-fixes

Update file references in Android projects