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

Change-Id: I4888401f7a339fccf3c0603c5d868be67bd0bf30