am 6db6ea02: Merge changes I00c852e4,Ib31bf028

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