Merge "Fix race condition in binder thread" into oc-dr1-dev
am: 33e014b9bc

Change-Id: I038fbe271d82a3e192eb95ea073fb482f27c65b6