Merge "Use LIBC_Q for LIBC_PRIVATE / LIBC_PLATFORM"