Merge "DO NOT MERGE: Add CTS test for CVE-2016-2429" into marshmallow-cts-dev
am: 88b4aba906  -s ours

Change-Id: I9e3d1ce75d127b78ad81ba4176e41461f931a471