Merge ab/5111269 into master

Bug: 119522286
Test: TH
Change-Id: I1ff02468380a167100c047d80cc3e91022c359d6
tree: bb86431b021d9b910bca0c12751ce4ffdce056a5
  1. common/
  2. guest/
  3. host/
  4. tests/
  5. tools/
  6. Android.bp
  7. Android.mk
  8. OWNERS