Merge changes I00c852e4,Ib31bf028

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