Merge "Revert "libstagefright: remove left shifts causing unsigned int overflow""