Merge "Fix CTS.RSCpp failures due to dispatch table entry missing in libRS.so for __LP64__"