Merge "Add Security Tests to CTS" into froyo