LOCAL_PATH fixes

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