base

Merge change 21106

* changes:
  In the simulator, make sure that the preview thread is a Java thread, since we won't be going through the binder in single process mode.