Merge "Merge "DO NOT MERGE: This test is to test the Remote Code Execution Vulnerabilities in libstagefright" into lollipop-mr1-cts-dev am: ec06372b7b  -s ours" into marshmallow-cts-dev
am: a433934a7e  -s ours

* commit 'a433934a7ed504f9d9505de35889c21c0553607b':
  DO NOT MERGE: This test is to test the Remote Code Execution Vulnerabilities in libstagefright

Change-Id: I4e58364481010d7290c7c5f2ceb666f3cd30a7c6