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

Change-Id: I9c3fda49fe6e07cc44f64ccea111e13be72286b1