Merge change 21112 into donut

* changes:
  Fix memory leaks in music app. Fixes http://b/issue?id=2046569