Merge changes Ie90f7f32,Ie1328b18

* changes:
  Fix unused argument error on darwin
  Remove libbacktrace dependency on libcutils