Reconciliation

Test: Local build
Change-Id: I3debfb4be795bf7995485f1530dbaa7a24e3cbc1
14 files changed
tree: d9e72eae4ef680f2aa4a184e4f0c117e2c70d616
  1. common/
  2. guest/
  3. host/
  4. tools/
  5. Android.bp
  6. Android.mk
  7. OWNERS