Directly test for UPower to avoir slow timeout
Merge branch 'imx-stable' of github.com:wolfgar/xbmc into imx-stable