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

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