Merge "Revert "Make MediaParser depend on the latest Exo version""