Merge "const correctness on downmix and upmix" into lmp-dev