am 715c78b9: am 225eec8d: am f9d4ba77: am 69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits"

* commit '715c78b933f8dec04882ebb73acd61fdd42c6c64':
  stagefright aacenc: Safeguard against overwriting bits
tree: 9f4bce8f4789d27c4ca0c3e0326ad4e03dce103a
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/