Merge "Fix use of uninitialized value in libmediadrm" into oc-dev am: 5924e3db24
am: 444b037748

Change-Id: I3031e17b0c9ccc8a4eadf78077b08e81e8d64e48