Merge "Retire the emulator workaround"
tree: 529fd22ec737e03fdd5c72280314192712444d7d
  1. liblog/
  2. logcat/
  3. logd/
  4. logwrapper/
  5. OWNERS
  6. PREUPLOAD.cfg
  7. TEST_MAPPING