Merge "2X2 matrix needs 4 float elements." into honeycomb-mr1