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

Change-Id: I5e865beb3ae30a1e3305ed0d52e6ecc5e534992c