Merge "Minor fixes to android.opengl.Matrix"