Merge "Remove dead code in libmedia"