[automerger skipped] Merge "Reconcile binder JNI with earlier changes, removing lock." am: c4a564a10a -s ours am: 93fe09a13c -s ours am: 8eb7a6bac2 -s ours
am: 2154ab59b4 -s ours
am skip reason: change_id I4e06b3f93e30ed1c7868ec9e018709a7e796e441 with SHA1 c1493b283b is in history

Change-Id: I45ff03aa4c69dc26324434a265b6d238cf6d9a4d