Merge "Check for drmhal plugin null pointer deref" into oc-dev
am: a5f3e42433

Change-Id: Ia35d482b590c286349a4534fecdc8815ed1d1bff