media-legacy: Fix conflict

Change-Id: I9f0293d4d3a9b7c43709a5e180a7f8da827a2697