Merge "Support AES-CBC sample encryption in MediaDrm"