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

* commit '69aae36e900cf7114c5895618747906951a11730':
  stagefright aacenc: Safeguard against overwriting bits
tree: 139c5400dd85eac7f0f21a96d97a1191c9551b69
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/