Merge "android.os.HwBinder: fix native static method signature" am: 65944e79b2
am: 21347cf052

Change-Id: I6ee75f8c697a46105a30d68a8ad79f00f543f9ac