Merge "DO NOT MERGE StageFrightTest: add CTS test for sw mpeg2 security fix." into marshmallow-cts-dev
am: ebe6957f12  -s ours

* commit 'ebe6957f12b81b178665f0f823b1c7e84e9dc41c':
  DO NOT MERGE StageFrightTest: add CTS test for sw mpeg2 security fix.

Change-Id: Ie04d61e2a17b057015f5e35e58b9ead63189cf9f