second commit after getting android emulator to work properly