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

* commit '2d5cbc92add5065a62acdd38cd254eebb1ee2f94':
  2X2 matrix needs 4 float elements.