Merge "Merge "Merge "Merge "BannedFilesTest: Detect "rootmydevice" vulnerability" into kitkat-cts-dev am: dd8ee3dca0" into lollipop-cts-dev am: 0732f30afe" into lollipop-mr1-cts-dev am: dba358fa3e" into marshmallow-cts-dev
am: 0675f542a8

* commit '0675f542a8a6d364cbda582cc6b9d7e208809324':
  BannedFilesTest: Detect "rootmydevice" vulnerability

Change-Id: I201305fb8e410bdee54ed8b0b1b8ae97ad209828