Manually merge changes from giant AOSP topic

Change-Id: Ia5b75f8a4eaa0742ffb2b305b1a3551a0d18bea5
tree: d89b695f1ad0b9aeae0f85a9fe3f1b2ff7ed77d6
  1. com/
  2. net/
  3. org/
  4. .gitignore