Remove dependency on src/android from dm and nanobench

bench/BitmapRegionDecoderBench.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "BitmapRegionDecoderBench.h"
 #include "CodecBenchPriv.h"
 #include "SkBitmap.h"
-#include "SkBitmapRegionDecoderPriv.h"
 #include "SkOSFile.h"
 
 BitmapRegionDecoderBench::BitmapRegionDecoderBench(const char* baseName, SkData* encoded,
         SkBitmapRegionDecoder::Strategy strategy, SkColorType colorType,
         uint32_t sampleSize, const SkIRect& subset)
     : fBRD(nullptr)
     , fData(SkRef(encoded))
     , fStrategy(strategy)
     , fColorType(colorType)
     , fSampleSize(sampleSize)
@@ skipping 12 matching lines @@
             SkASSERT(false);
             strategyName = "";
             break;
     }
 
     // Choose a useful name for the color type
     const char* colorName = color_type_to_str(colorType);
 
     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 :).

     }
 }
 
 const char* BitmapRegionDecoderBench::onGetName() {
     return fName.c_str();
 }
 
 bool BitmapRegionDecoderBench::isSuitableFor(Backend backend) {
     return kNonRendering_Backend == backend;
 }
 
 void BitmapRegionDecoderBench::onDelayedSetup() {
     fBRD.reset(SkBitmapRegionDecoder::Create(fData, fStrategy));
 }
 
 void BitmapRegionDecoderBench::onDraw(int n, SkCanvas* canvas) {
     for (int i = 0; i < n; i++) {
         SkBitmap bm;
         SkAssertResult(fBRD->decodeRegion(&bm, nullptr, fSubset, fSampleSize, fColorType, false));
     }
 }