Merge "recovery_test_component: Add libbinderthreadstate as static dependency." am: 2dcbebf88f am: 20eb921f47
am: 927c8048a3

Change-Id: Ia5fe97749c11e42b41cff5cb98f501af04794bf5