Remove dependency on src/android from dm and nanobench

dm/DM.cpp

Index: dm/DM.cpp
diff --git a/dm/DM.cpp b/dm/DM.cpp
index 2587b0da08724eb5f5c7d0dd2c7768985ec3801a..403252b03d7e3d205d086df4dc5839dc6dd99fbc 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -12,7 +12,6 @@
 #include "OverwriteLine.h"
 #include "ProcStats.h"
 #include "SkBBHFactory.h"
-#include "SkBitmapRegionDecoderPriv.h"
 #include "SkChecksum.h"
 #include "SkCodec.h"
 #include "SkCommonFlags.h"
@@ -285,7 +284,7 @@ static void push_android_codec_src(Path path, AndroidCodecSrc::Mode mode,
     }
 
     if (1 != sampleSize) {
-        folder.appendf("_%.3f", get_scale_from_sample_size(sampleSize));
+        folder.appendf("_%.3f", 1.0f / (float) sampleSize);
     }
 
     AndroidCodecSrc* src = new AndroidCodecSrc(path, mode, dstColorType, sampleSize);
@@ -441,7 +440,7 @@ static void push_brd_src(Path path, SkBitmapRegionDecoder::Strategy strategy,
     }
 
     if (1 != sampleSize) {
-        folder.appendf("_%.3f", get_scale_from_sample_size(sampleSize));
+        folder.appendf("_%.3f", 1.0f / (float) sampleSize);
     }
 
     BRDSrc* src = new BRDSrc(path, strategy, mode, dstColorType, sampleSize);