Merge "Fix ViewCaptureTest, Bitmap.sameAs"