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

Change-Id: Ic6891d77fa1261c6e82781b5a777c3aa47f04356