This change renames a few variables to fix the build in VS 2015. VS 2015 new warnings: http://blogs.msdn.com/b/vcblog/archive/2014/11/12/improvements-to-warnings-in-the-c-compiler.aspx Change-Id: Ic9c3f75ee717f0125960c813df442ed4fbcceb4a
Bug: 15777858 Change-Id: Iabef9b8c8044e593bb89510feebdee00d2f1840b Tested: on Linux and Windows.