Reconciliation

Test: Local build
Change-Id: I3debfb4be795bf7995485f1530dbaa7a24e3cbc1
Merged-In: I3debfb4be795bf7995485f1530dbaa7a24e3cbc1
(cherry picked from commit dd6f26de83f95b44e69b1cc7cdcd7cd53c645289)
14 files changed
tree: 6a7c0d72cc6972133e28dcfefc5f5eff77fa6d3d
  1. common/
  2. guest/
  3. host/
  4. tools/
  5. Android.bp
  6. Android.mk