Merge "avc/hevc: Align 128 everywhere" am: b7765027ec am: d008085fbd

Change-Id: Ic6b3f616e786dc40fc44e90747ecab0f0a08a151