am 69897ae4: am 75afcc1f: Merge "Use define for drm property keys instead of defining as char pointers"

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