Merge "encoder: Fix entropy sync mode for height <= 64" am: a5f7557e5f am: 082ba20452

Original change: https://android-review.googlesource.com/c/platform/external/libhevc/+/1629485

Change-Id: I4f1cf898669cca4c209f0e3ea2932f1fb3b69e42