Merge changes I677dff58,I5748fbbb,I7803be1e

* changes:
  Remove microdroid_payload.json
  microdroid_manager waits for task to exit
  Refactor MicrodroidTestCase