am 972efafb: am 6db6ea02: Merge changes I00c852e4,Ib31bf028

* commit '972efafb90b543eea51aa5b23104d469a1bcc1fb':
  stagefright aacenc: Avoid overflows when calculating normFactor
  stagefright aacenc: Avoid a division by zero
tree: f56030cdfaf13601dc27a1ae3e53a8d94c236351
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/