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

Change-Id: Ie6196ec863e1ffc88e14a3f0035b3938457e21bc