Merge "SF/HWC2: Add a layer minidump" into nyc-mr1-dev
am: a020f00bc1

Change-Id: I8abb4cefe2d13090446ab13d0af345b46496074e