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

* commit 'd860242cbc99096179845c1d67758ce071959af5':
  Fix Suid File Scanner Activity