Merge "Fix build"

Author: Romain Guy

graphics/java/android/graphics/Canvas.java

@@ -522,9 +522,8 @@ public void getMatrix(Matrix ctm) {
     /**
      * Return a new matrix with a copy of the canvas' current transformation
      * matrix.
-     *
-     * @Deprecated
      */
+    @Deprecated
     public final Matrix getMatrix() {
         Matrix m = new Matrix();
         //noinspection deprecation