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

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