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

Change-Id: I43d37ca45ed9c0a6c26799cf323c72dec5228ca9