Merge "Clean up libRSSupport.so and libclcore.bc dependencies."