Merge "Fix resource leaks in drm hal" into oc-dev am: 14b91049a7
am: fbe6eee2e5

Change-Id: Ied6aca47ea624dad2ae7778b4e70397dfaf02a4f