am 40f7f977: Merge "Add Security Tests to CTS" into gingerbread

* commit '40f7f9772ef3faa1de2041e85a5450f9054b9868':
  Add Security Tests to CTS