Merge \"Merge \\"DO NOT MERGE: This test verifies the heap buffer overflow present in libskia: SkICOImageDecoder::onDecode() while decoding the malformed ICO file\\" into kitkat-cts-dev am: 93a6d68325  -s ours\" into lollipop-cts-dev
am: 1774721505  -s ours

Change-Id: Idd0c1b80d0a981fa72bfe425e95d65457b4a048c