Merge "Refactor android.graphics.Picture JNI bindings."