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

Change-Id: Ie563efbf3b0558b89cf3b4d07eec457d307dff70