Adding changes to support the Android emulator