More Android fun

This should be close to working for android notifications. I don't have a way to test 7e12c86 off-hand, however, so please look over those changes carefully before merging. :/