Update includes and include guards for encoder directory rename. Handles breakages caused by renaming client_encoder to encoder. Change-Id: I15e418f1a5d0ca36da5a8d0f653ddbdff218bb86