Merge "DO NOT MERGE: Revert "Revert "This test verifies recursive decoding of malformed ICO file which should not lead to skia buffer overflow""" into marshmallow-cts-dev
am: 8b105f58a4  -s ours

* commit '8b105f58a4aafeb0c6c88d5743ca99a319d86091':
  DO NOT MERGE: Revert "Revert "This test verifies recursive decoding of malformed ICO file which should not lead to skia buffer overflow""

Change-Id: I298fbba69bb528fd859cf309654d3728bf6319d4