am c7bc4150: Android code should not assume main thread == UI thread.

* commit 'c7bc4150c7dee00c658772863a771d00102e00fb':
  Android code should not assume main thread == UI thread.