Merge "No need to include cutils/threads.h" into main