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

Change-Id: Iba84148eb309ed5e6466b2c7dd31a8c365eedb8b