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

Change-Id: Ied4a966d455aabe8f94e1b85ce53e62bcdffd4d0