Merge "DO NOT MERGE: Add CTS test for CVE-2016-2429" into lollipop-mr1-cts-dev