Merge "Minor code cleanups to DrmHal"