Unified commit
Icon and basic Android app work in emulator.