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

Change-Id: I0c5c1539b98441c0d5d987d88670b686b146571b