Noop merge of aosp/cuttlefish-testing into goog/cuttlefish-testing

We're doing this to pacify the automerger
BUG: 114488854
Test: Automerger should clear

Change-Id: I4831e360a8e1b70861bd542ec4f49098b6ce20ca
tree: 14c20cf7368937e73556b6c3a4e207b8ec346a9a
  1. common/
  2. guest/
  3. host/
  4. tests/
  5. tools/
  6. Android.bp
  7. Android.mk
  8. OWNERS