Merge "Revert "[RenderScript] remove redundant build flag""