Merge "Use non-fast JNI for Canvas.native_drawBitmap." into nyc-mr1-dev