Merge "Revert "recovery_test_component: Add libbinderthreadstate as static dependency."" am: 968009cd5b
am: 76eaa35201

Change-Id: I62bed901dde046bc807b436d4df85d31f11cd9e0