Merge \\\\"Remove dead rotate90CW_4x4_16v6.S.\\\\" am: 8add6456df am: dab2cd94ef am: ceba245f09
am: 617ed00486

Change-Id: Ib609d60faf577e0b3714399df31223d752a6f080