Merge "Fix some google-runtime-int warnings in libstagefright."