am b7b0eaff: am 1d9f784f: am 0ffaa2b7: Merge "Fix __android_log_assert to abort."

* commit 'b7b0eaff584c47506279d21ccf1d81f86fcc4369':
  Fix __android_log_assert to abort.