Use more idiomatic naming in test code.

(I introduced this in https://android-git.corp.google.com/g/46305.)

Change-Id: I100202fc18e246dd7b66870ce75543642505336d
1 file changed