[automerger skipped] Merge "Respect crop scaling mode for texture transforms in BufferLayerConsumer" am: 4812c1b968 am: 6a84a7129d
am: b13d74b89b -s ours
am skip reason: change_id I0621f3fbd48a4e90e61154379478980f513d354f with SHA1 2ee0dda96a is in history

Change-Id: Ieed96be91b5801aff1df3f2d906bd5566805475a