Merge "Fix rsDebug issues with compat lib and long/long long changes." into lmp-dev