Merge "Fix Suid File Scanner Activity" into gingerbread