Merge "Fix some google-runtime-int warnings in libstagefright." am: 9a6b820294
am: c892a3c6d0

Change-Id: I6f3dcce1ff863a4e7f56dae73f5c2aca05685c2d