am 9c3eca7b: resolved conflicts for merge of 6cf3c7c5 to jb-dev-plus-aosp

* commit '9c3eca7bcee694e6a477a7d50065f11cf1e805bb':
  Let pthread_create fail if schedparam can't be set