May the best location win

Improve logic to decide which location should be used. Also updates android SDK version and robolectric.