Updated gyp files for Android build