Merge pull request #183
Bug 996320 - Check that we can start adbd as root