Merge "Add libbinderthreadstate to LOCAL_JNI_SHARED_LIBS for some tests" am: 604b0eed1f am: a0484ac42f
am: 0c4fad5e92

Change-Id: I77c35778a14ac8671a87a7a0d2bd2ce77409a363