Merge "libmedia: Fix build with gcc 4.7"