am 0c95e26c: resolved conflicts for merge of eda2a209 to jb-dev-plus-aosp

* commit '0c95e26c651dc237df8f3f91e38da3f3f5487426':
  update bootloader to 3.39