am 536b81af: resolved conflicts for merge of 053b8654 to jb-dev-plus-aosp

* commit '536b81afed42ba6be1f824cf90d9a1e17a913c9c':
  Enhance native stack dumps.