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

Change-Id: Iefe3e2b4022216b6df512fc66bfcc103b4b17ee8