Refactor pick cdef to support cb4x4 Replace hard coded numbers to support the 4x4 coding block structure. Change-Id: I3602e09c8cfae9765069848828b534d177a75774