This was being worked around by forcing highbitdepth to be off when
enabling tx64x64.

With the fixes, removed the work-around.

Change-Id: I3102f9e17d4037af96a9eff418c5af6a97fd740c