Merge "libmediadrm: refactor bundle dependency"