layers: GH7, Fix bad var names in layer utils

Change-Id: Iec47953ba0611de5c62f4fa876eb02fefca32427
1 file changed