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

* commit '6fd507b92746481f63922059697226c8ec6ad72b':
  stagefright avcenc: Switch tmp variables to use the right type, to avoid casting