Merge "Add libbinderthreadstate to LOCAL_JNI_SHARED_LIBS for some tests." am: 935cf49aaf
am: fc0f789213

Change-Id: I29cd338b7600b74c3fb6e8bc36435c4c68ccedc1