This CL doesn't change coding behavior. It is to facilitate the
following implementation of adaptive scan order

Change-Id: I229963cb5185812a2da43f5c8a6506b296452a6a