Merge "Move dump() to dumpAsync(), more oneway calls."
am: 5773d9702e  -s ours

Change-Id: Ifc71dfc411dfd8d4fc23b8e7f0843ee90607bb3b