am 3557654c: am 66da3fdc: am 972efafb: am 6db6ea02: Merge changes I00c852e4,Ib31bf028

* commit '3557654c95bae7754dcd1951ec10742b895817e2':
  stagefright aacenc: Avoid overflows when calculating normFactor
  stagefright aacenc: Avoid a division by zero