Merge "Fix letterbox in fixed rotation transform" into rvc-dev am: 711ba26816 am: 103626d0d1 am: f74b32ee95

Change-Id: I17a4ebd05acedd4543f624d85ee52ed81700f88d