Merge goog/master into goog/gce-dev

Test: diff
Change-Id: I6ab9a60f567ae2f9b066f789c41221816e29fb93
tree: 711b260dfa5de669e9e9b638685e9a280850f2ac
  1. common/
  2. guest/
  3. host/
  4. tools/
  5. Android.bp
  6. Android.mk