am b7a15500: Merge changes Ie90f7f32,Ie1328b18

* commit 'b7a15500c21a59bff4a4c547204937edfa3e3886':
  Fix unused argument error on darwin
  Remove libbacktrace dependency on libcutils