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

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