Merge changes If80c6a9c,I7b1c53d4
am: ad6645e36c

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