Remove dependency on src/android from dm and nanobench

bench/BitmapRegionDecoderBench.cpp

Index: bench/BitmapRegionDecoderBench.cpp
diff --git a/bench/BitmapRegionDecoderBench.cpp b/bench/BitmapRegionDecoderBench.cpp
index a98dbb0cc5fb1942f87a5649ded8d4ff6eff5735..125c4a84cf887a0624ed7e4d0632c2188614f70f 100644
--- a/bench/BitmapRegionDecoderBench.cpp
+++ b/bench/BitmapRegionDecoderBench.cpp
@@ -8,7 +8,6 @@
 #include "BitmapRegionDecoderBench.h"
 #include "CodecBenchPriv.h"
 #include "SkBitmap.h"
-#include "SkBitmapRegionDecoderPriv.h"
 #include "SkOSFile.h"
 
 BitmapRegionDecoderBench::BitmapRegionDecoderBench(const char* baseName, SkData* encoded,
@@ -41,7 +40,7 @@ BitmapRegionDecoderBench::BitmapRegionDecoderBench(const char* baseName, SkData*
 
     fName.printf("BRD_%s_%s_%s", baseName, strategyName, colorName);
     if (1 != sampleSize) {
-        fName.appendf("_%.3f", get_scale_from_sample_size(sampleSize));
+        fName.appendf("_%.3f", 1.0f / (float) sampleSize);

[mtklein, 2015/11/13 17:37:09]

all these (float) are implicit, but lgtm if it makes you feel better to write
them.

[msarett, 2015/11/13 17:47:07]

It does make me feel better to remind myself that an int to float conversion is
happening :).

     }
 }