pff: permission spoofing - contacts and phone log
plus some code cleanup

Change-Id: I55d6fc447e9664e2895f4d07bff3518885bcdb91