Native doesn't ever actually care about the attributes of keys, so move all of it up into the managed layer and move all of the key names down so they're defined once. Change-Id: Ic8ded13ce050b2b98744735ff50d11e8d882d7d5
Change-Id: I6bc3760341868015f054d9866e2616a312da94e0
Change-Id: I4983db61b53e28479fc90d9211fafff68f7f49a6