Merge "Switch to librs.FOO.so instead of libFOO.so to prevent collisions."