Merge pull request #2086 from jlipps/master

android fixes
fix tests which rely on the desired caps which no longer exist