am 49fe9d6b: am d4ad6875: am de91aaab: am d9c6add8: am c22d3071: am 2fd32ce7: am 0b46699b: am 1154fff7: am e887a765: Merge "Fix AudioPolicyBinderTest test_isStreamActive" into klp-dev

* commit '49fe9d6b295775b7ca744999b1252414f1cec52a':
  Fix AudioPolicyBinderTest test_isStreamActive