am 69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits"

* commit '69aae36e900cf7114c5895618747906951a11730':
  stagefright aacenc: Safeguard against overwriting bits