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

Change-Id: I74ba49651bbafd1810c3c5a3ddb70eb3a79a4dd2