Merge "Merge "Merge "Revert "DO NOT MERGE: CTS test case for CVE-2015-1530"" into lollipop-cts-dev am: c4b650a386  -s ours" into lollipop-mr1-cts-dev am: 8f82f57c89  -s ours" into marshmallow-cts-dev