Merge changes for aosp release into master

Test: Local build
Change-Id: Ie043d33328c860b952d608b1e2ced705e2500f88
tree: e11fa26f86f19ff4d40ea5edb1d432dd9b1c16f2
  1. common/
  2. guest/
  3. host/
  4. tools/
  5. Android.bp
  6. Android.mk