Remove dependency on src/android from dm and nanobench

dm/DM.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "CrashHandler.h"
 #include "DMJsonWriter.h"
 #include "DMSrcSink.h"
 #include "DMSrcSinkAndroid.h"
 #include "OverwriteLine.h"
 #include "ProcStats.h"
 #include "SkBBHFactory.h"
-#include "SkBitmapRegionDecoderPriv.h"
 #include "SkChecksum.h"
 #include "SkCodec.h"
 #include "SkCommonFlags.h"
 #include "SkFontMgr.h"
 #include "SkForceLinking.h"
 #include "SkGraphics.h"
 #include "SkMD5.h"
 #include "SkMutex.h"
 #include "SkOSFile.h"
 #include "SkTHash.h"
@@ skipping 252 matching lines @@
             folder.append("_kGray8");
             break;
         case CodecSrc::kIndex8_Always_DstColorType:
             folder.append("_kIndex8");
             break;
         default:
             break;
     }
 
     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);
     push_src("image", folder, src);
 }
 
 static void push_codec_srcs(Path path) {
     SkAutoTUnref<SkData> encoded(SkData::NewFromFileName(path.c_str()));
     if (!encoded) {
         SkDebugf("Couldn't read %s.", path.c_str());
@@ skipping 135 matching lines @@
             break;
         case CodecSrc::kGrayscale_Always_DstColorType:
             folder.append("_kGray");
             break;
         default:
             SkASSERT(false);
             return;
     }
 
     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);
     push_src("image", folder, src);
 }
 
 static void push_brd_srcs(Path path) {
 
     const SkBitmapRegionDecoder::Strategy strategies[] = {
             SkBitmapRegionDecoder::kCanvas_Strategy,
@@ skipping 677 matching lines @@
     #endif  // SK_PDF_IMAGE_STATS
     return 0;
 }
 
 #if !defined(SK_BUILD_FOR_IOS)
 int main(int argc, char** argv) {
     SkCommandLineFlags::Parse(argc, argv);
     return dm_main();
 }
 #endif