Merge "cec: move cec headers to uapi directory"