Merge "Minor fixes to android.graphics.Matrix"