Merge "NdkMediaDrm: properly check null listeners" into qt-qpr1-dev
am: 611fc70511

Change-Id: Ibb3212a1c41b50ecc8581cc2a6238b37dcd9f387