Merge "Revert "Codec2: separate platform dependency""