Un-deprecate new methods to fix Android.

src/core/SkGlyph.h

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkGlyph_DEFINED
 #define SkGlyph_DEFINED
 
@@ skipping 77 matching lines @@
             rb <<= 2;
         } else if (SkMask::kLCD16_Format == format) {
             rb = SkAlign4(rb << 1);
         } else {
             rb = SkAlign4(rb);
         }
         return rb;
     }
 
 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
-    SK_ATTR_DEPRECATED("Temporary accessor for Android.")
+    // Temporary accessor for Android.
     SkFixed advanceXFixed() const { return fAdvanceX; }
-    SK_ATTR_DEPRECATED("Temporary accessor for Android.")
+    // Temporary accessor for Android.
     SkFixed advanceYFixed() const { return fAdvanceY; }
 #endif
 
     unsigned rowBytes() const {
         return ComputeRowBytes(fWidth, (SkMask::Format)fMaskFormat);
     }
 
     bool isJustAdvance() const {
         return MASK_FORMAT_JUST_ADVANCE == fMaskFormat;
     }
@@ skipping 91 matching lines @@
     // FIXME - This is needed because the Android frame work directly
   // accesses fID. Remove when fID accesses are cleaned up.
 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
   public:
 #endif
     uint32_t    fID;
 };
 SK_END_REQUIRE_DENSE
 
 #endif