Merge "Add lock on mCallbacks in ServiceBinder" am: fa65601a5d
am: be57778d04

Change-Id: Ia29deb7243197f5dab0a77f988be02569bcc8ef2