Merge "Use non-fast JNI for Canvas.native_drawBitmap." into nyc-mr1-dev
am: 938d298116

Change-Id: Ie9c4ffd766ba9965ef2287a9e5a45cbe81555c58