Merge pull request #1607 from jlipps/master

remove dependency on grep for android device (fix #1540)
fix authorize-ios (fix #1499)