[automerger skipped] Merge "renderengine: avoid divide-by-zero in shaders" am: 6856100151 am: a734fdda25
am: 83c30643db  -s ours

Change-Id: I3a33560bd32a0bcb31f2aa44929ace37c2ef0c14