Merge "Add libbinderthreadstate to LOCAL_JNI_SHARED_LIBS for some tests."