Merge "libstagefright/matroska: Fix build with gcc 4.7"