Fix compile errors with loop-restoration + highbd Change-Id: I0d9850e082b8da3b182a3bbaf6569c45317c9659