Merge "Remove obsolete references to libmedia_native"