Merge "[RenderScript] Use OVERRIDE_RS_DRIVER string in the default implementation." am: 292cddf6be am: 0a8c6b55cf
am: 4c9037094a  -s ours

Change-Id: Ibbbf9dc4780190850214b6431d9be0a9eb849375