Fix Android location test
Merge pull request #3711 from imurchie/isaac-location

Fix Android location test
Merge pull request #1 from appium/master

Update from upstream