Merge "Don't go through RSContext for the Java reflection (take 2)"