Merge "Revert "Fix resource leaks in drm hal"" into oc-dev am: db15c4b6ee
am: ddd1c63569

Change-Id: Iab79f9667ed22427c11e133da60b3371723239bb