Merge changes from topic "odm_dlkm"

* changes:
  Correct labels on files / props in odm_dlkm.
  Fix path for vendor_dlkm build prop.