Merge "Remove dependency on libcompiler_rt.so for RS compatibility."