make unlock.apk work for selendroid
and also take into account screenlock differences for 2.3.3