Merge "Revert "Split libmedia into libmedia and libmedia_native""