Fix shadowed variable declaration with misc fixes.
Fix shadowed variable declaration with misc fixes.

Change-Id: I73f61d65297009ffdba7a3c0685a06a5ae559ccb

mbebenita/aom,smarter/aom,luctrudeau/aom,mbebenita/aom,smarter/aom,smarter/aom,mbebenita/aom,GrokImageCompression/aom,smarter/aom,mbebenita/aom,GrokImageCompression/aom,luctrudeau/aom,luctrudeau/aom,luctrudeau/aom,mbebenita/aom,mbebenita/aom,mbebenita/aom,smarter/aom,smarter/aom,GrokImageCompression/aom,mbebenita/aom,mbebenita/aom,luctrudeau/aom,luctrudeau/aom,GrokImageCompression/aom,GrokImageCompression/aom,GrokImageCompression/aom