Merge \"HWC2: Clear transform for SolidColor layers\" into nyc-mr1-dev
am: 379d2f3528

Change-Id: Ibb49d4f185002d132d72d6dfdbed0b46ac5d6a03