am 06a237b0: am ca20104a: Merge "Fix issue 2678048: binder death detection in AudioFlinger is broken." into kraken