Convert handler creation on the main thread.

bug:31556595
Change-Id: I523f7245272cc1622177fb82890fc7961da44066
2 files changed