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

Change-Id: I2747be2fd19e31dd99c985492c955c5b2e2b0f62