Merge "Fix RenderScript benchmark test key mapping"