Merge "Merge "DO NOT MERGE Add CTS test for CVE-2016-2429" into kitkat-cts-dev am: 532f593a9e  -s ours" into lollipop-cts-dev
am: c2d4f15907  -s ours

Change-Id: I77b02ea874607bcd2dc80e26f7739b21fd5ca239