am 1154fff7: am e887a765: Merge "Fix AudioPolicyBinderTest test_isStreamActive" into klp-dev

* commit '1154fff78fcb69c272951ae784575b34e97ac046':
  Fix AudioPolicyBinderTest test_isStreamActive