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

* commit 'b486d61815593cfdc11ce3df18adbf3ace5b2a56':
  Add Security Tests to CTS