Merge "Fix drm hal resource leaks" into oc-dev
am: 63398bbd71

Change-Id: Iae4c7f407e638dd2dba5acfc43a3ca894f665bd4