Merge "Place nuplayer headers in a subdirectory"