Remove identifier that causes warnings under OpenJDK 8 compiler

Bug: 24494019
Change-Id: I4cdf6c594773cd66367671cd8f9b63cd9d852730
4 files changed