Revert "DO NOT MERGE: CTS test case for CVE-2015-1530" am: 480a3a5017  -s ours am: f22181e287  -s ours am: 630332f00e  -s ours am: 319452a0a2 am: ec86723598 am: dde7567c54 am: 1836625cfe  -s ours am: 45883cd08d
am: d0b06376ef

Change-Id: Ibb0154ff91e4b74c3a80350544c365cc8700b181