Fix build

Change-Id: If06bb78b4cc1501bacc58538e53cc561ff803f7b
Merge branch 'master' of git://github.com/koush/Superuser