Merge "libmediadrm: fix a use of an uninit value" am: 3ba521f0ba am: 87e6db673a am: 544847bc34
am: cb1077dfa6

Change-Id: I219a8977b9d14a0f7de247676e7b3f259f8cffc1