am f02769d6: am 817e1ef4: Merge "Use define for drm property keys instead of defining as char pointers"

* commit 'f02769d6ba2b06ee6be80315f39b43679e9e905f':
  Use define for drm property keys instead of defining as char pointers