Revert the configKey generation algorithm to what it was in K.

Bug: 17670914
Change-Id: Ibb2ea26ea28a38518caab7d1b45ae535a0eaf661
1 file changed