Upstream changes from Android.

src/core/SkBitmap.cpp

Index: src/core/SkBitmap.cpp
diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp
index fe4255d9b5e2ac41d267f62dfc178d48a12e3098..1097fe5e64656ae5fe5a602e593e9d82436c317f 100644
--- a/src/core/SkBitmap.cpp
+++ b/src/core/SkBitmap.cpp
@@ -145,6 +145,9 @@ void SkBitmap::swap(SkBitmap& other) {
     SkTSwap(fConfig, other.fConfig);
     SkTSwap(fFlags, other.fFlags);
     SkTSwap(fBytesPerPixel, other.fBytesPerPixel);
+#ifdef SK_BUILD_FOR_ANDROID
+    SkTSwap(fHasHardwareMipMap, other.fHasHardwareMipMap);
+#endif
 
     SkDEBUGCODE(this->validate();)
 }