am 6b2b7009: Merge changes Ibb3b6ff0,I2341e20c into jb-mr2-dev

* commit '6b2b7009560964ed25cde06602872dff763b09f4':
  rename binder services main thread to Binder_*
  limit number of extra binder threads in SF to 4