Merge "Revert "DO NOT MERGE: CTS test case for CVE-2015-1530" am: 480a3a5017  -s ours am: f22181e287  -s ours" into marshmallow-cts-dev