Merge changes I08dd7ef6,I155cbc8a
am: e54f16e051

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