Merge "android.os.HwBinder: fix native static method signature"