am 3681ecff: am 91678546: am accc6844: CtsVerifier Suid File Scanner

Merge commit '3681ecffebf656e009f99cc6d7b4639f5b2ccc1f' into gingerbread-plus-aosp

* commit '3681ecffebf656e009f99cc6d7b4639f5b2ccc1f':
  CtsVerifier Suid File Scanner