am 6fd507b9: Merge "stagefright avcenc: Switch tmp variables to use the right...
am 6fd507b9: Merge "stagefright avcenc: Switch tmp variables to use the right type, to avoid casting"
* commit '6fd507b9':
stagefright avcenc: Switch tmp variables to use the right type, to avoid casting