Merge pull request #1230 from jlipps/master

fix some selendroid and unlock_apk issues