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

Change-Id: Ibd45d3c5f38c506606d0dc8fdd5a886f749999b8