Fix -Wshadow-field warnings.

Test: build
Change-Id: I15c7a530ab7c4ba038c49b7ba48dcf76422a2b5f
2 files changed