Merge \"Merge \\"DO NOT MERGE: CTS test case for CVE-2015-1530\\" into kitkat-cts-dev am: 0277fe2892  -s ours\" into lollipop-cts-dev
am: 6aea479ef7  -s ours

Change-Id: I6a06f80fceac50c3ca1a0aa0a3747b180a74ed9d