change SkAnnotation to not inherit from SkFlattenable (does not need dynamic factories)

src/core/SkAnnotation.cpp

Index: src/core/SkAnnotation.cpp
diff --git a/src/core/SkAnnotation.cpp b/src/core/SkAnnotation.cpp
index 1230cb4de81003f0de90accbc8517706d685374d..f32164cb18c21ddbc8945b2b282590262252f230 100644
--- a/src/core/SkAnnotation.cpp
+++ b/src/core/SkAnnotation.cpp
@@ -30,13 +30,13 @@ SkData* SkAnnotation::find(const char key[]) const {
     return fKey.equals(key) ? fData : NULL;
 }
 
-SkAnnotation::SkAnnotation(SkFlattenableReadBuffer& buffer) : INHERITED(buffer) {
+SkAnnotation::SkAnnotation(SkFlattenableReadBuffer& buffer) {
     fFlags = buffer.readUInt();
     buffer.readString(&fKey);
     fData = buffer.readByteArrayAsData();
 }
 
-void SkAnnotation::flatten(SkFlattenableWriteBuffer& buffer) const {
+void SkAnnotation::writeToBuffer(SkFlattenableWriteBuffer& buffer) const {
     buffer.writeUInt(fFlags);
     buffer.writeString(fKey.c_str());
     buffer.writeDataAsByteArray(fData);