am 23a9cf1d: am 484a47c4: am b7a15500: Merge changes Ie90f7f32,Ie1328b18

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