Merge "Don't pull in external/junit through mockito"
tree: df8341581db375256c04867c56c4a2611561fca4
  1. libwifi_hal/
  2. libwifi_system/
  3. service/
  4. tests/