Merge "Revert "[RenderScript] fix support lib after Native RS API change.""