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

Change-Id: I55f5f2c99602e4972238acade28ab7c07199c0c9