Merge "Avrcp: Fix the potential NPE in AvrcpController jni callback"