Clean up dreamland

Sort imports and exchange inline Runnables for lambdas

Bug: 133216167
Test: m && ./vendor/google/tools/flashall
Merged-In: Ife3d13904a698efbe0933676b176ac1fbb53d0bd
Change-Id: Ife3d13904a698efbe0933676b176ac1fbb53d0bd
(cherry picked from commit 21cab31b8260163ae9a14b9a9083703175767646)
2 files changed