Fix PDroid 1.54

(including quick fix http://forum.xda-developers.com/showpost.php?p=38794149&postcount=711)