Manually merge changes from giant AOSP topic

Change-Id: Iaf5174711e9fd77eaddecc0dd9e31d0778b3540e
tree: 98d084dc937b8a6d6eb20d28881b8b0ab0fcf65e
  1. files/
  2. google/
  3. Android.mk
  4. README.cacerts