Merge "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" into lollipop-mr1-cts-dev
am: 0c39fd6bab  -s ours

Change-Id: I449a8b9dc03f71593e690fb2d47ab719ec755c07