Merge pull request #1518 from jlipps/master

enable setLocation on selendroid (fix #1511)
kill uiautomator before running test (fix #1517)