am b6be7517: (-s ours) am c7bc4150: Android code should not assume main thread == UI thread.

* commit 'b6be751718f4af376340ac0dce2370b8ae3456ad':