Merge "Revert "DO NOT MERGE: CTS test case for CVE-2015-1530"" into lollipop-cts-dev am: c4b650a386  -s ours am: ded865b135  -s ours am: a28d3c3383  -s ours am: 303d2b7490 am: cd04a25c4b am: 23cb596000 am: 62e9852c06  -s ours
am: 20f25192a0

Change-Id: Id3141cc442686502ebc417a517c42e2c382c726e