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

Change-Id: I78728c56b2f55222aa52efdc1ea26bf94c832423