Merge "Revert "Set flags in RS JNI calls for rsObj creation"" into nyc-dev