Merge "RenderScript should not depend on libsurfaceflinger_client.so"