[automerger skipped] Merge "Reconcile binder JNI with earlier changes, removing lock."
am:c4a564a10a-s ours am skip reason: change_id I4e06b3f93e30ed1c7868ec9e018709a7e796e441 with SHA1c1493b283bis in history Change-Id: I7b4bc1e7295383e9afa31210aff3c1bae6728831
This commit is contained in: