Merge "libstagefright: Bug Fix"