Merge "Reland: "recovery_test_component: Add libbinderthreadstate as static           dependency.""
am: f89067ab97

Change-Id: I893141a2b491fb398ab1e2a6fd966401ab06cfd9