Code cleanup following recapture of skps

src/core/SkPicture.cpp

Index: src/core/SkPicture.cpp
===================================================================
--- src/core/SkPicture.cpp	(revision 12468)
+++ src/core/SkPicture.cpp	(working copy)
@@ -284,18 +284,11 @@
     if (!stream->read(&info, sizeof(SkPictInfo))) {
         return false;
     }
+
     if (PICTURE_VERSION != info.fVersion
-#ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V13_AND_ALL_OTHER_INSTANCES_TOO
-        // V13 is backwards compatible with V12
-        && PRIOR_PRIOR_PICTURE_VERSION != info.fVersion  // TODO: remove when .skps regenerated
-#endif
-#ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V14_AND_ALL_OTHER_INSTANCES_TOO
-        // V14 is backwards compatible with V13
-        && PRIOR_PICTURE_VERSION2 != info.fVersion  // TODO: remove when .skps regenerated
-#endif
 #ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V16_AND_ALL_OTHER_INSTANCES_TOO
         // V16 is backwards compatible with V15
-        && PRIOR_PICTURE_VERSION3 != info.fVersion  // TODO: remove when .skps regenerated
+        && PRIOR_PICTURE_VERSION != info.fVersion  // TODO: remove when .skps regenerated
 #endif
         ) {
         return false;