Merge changes I8b57ef5e,I7545ec8e
am: 698c8df9e0

Change-Id: I368209d35dfae81ded33ebf9a4bb3a6861316b3c
tree: 9b34cef2b45e1fa5623a5d6c8918d407b67d0e60
  1. common/
  2. guest/
  3. host/
  4. tests/
  5. tools/
  6. Android.bp
  7. Android.mk
  8. OWNERS
  9. TEST_MAPPING