Merge "frameworks/base: Fix AudioService JNI leaks" into pi-dev