Merge "libstagefright: fix 64-bit warnings"