Merge changes Ibb3b6ff0,I2341e20c into jb-mr2-dev

* changes:
  rename binder services main thread to Binder_*
  limit number of extra binder threads in SF to 4