Merge "renderengine: avoid divide-by-zero in shaders" am: 6856100151
am: a734fdda25

Change-Id: I7b74157f48ef68d8e35229c42eb205bd3a19feef