am ff6b0e24: am f1896106: Merge "Fixed VM memory leak in AudioSystem JNI interface"

* commit 'ff6b0e24725c642f0681e214f143a8151e4e6bea':
  Fixed VM memory leak in AudioSystem JNI interface