Merge pull request #811 from jlipps/master

android activity fixes
update test for new activity style