am 7234280e: Merge "Fix Suid File Scanner Activity" into gingerbread

* commit '7234280efe27eea9afb32732651a0da806440bb3':
  Fix Suid File Scanner Activity