Merge "libbinder: avoid re-registering callback" am: 99d08bf388 am: 6cf94cef22 am: 82ebcc9bca

Change-Id: Ia58b74dc8d80e911f16ad07055ff7a1dacac549e