Rename some newly added k...Key constants that broke jumbo builds

The new code used the same constants
as, and since in some jumbo builds those
files compile in the same translation unit, those clashed.

This is a quick rename to give the clashing variables unique names
to make builds happy again. An alternative solution would be to
reuse the variables if they have the same value (the linker will
(probably?) merge them anyway so probably no wasted binary size).,

Bug: 891788
Change-Id: Ia7342f249c9bb0cdb6697e8be00413879b26d284
Commit-Queue: Daniel Bratell <>
Reviewed-by: Daniel Bratell <>
Cr-Commit-Position: refs/heads/master@{#596572}
2 files changed