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

Change-Id: Ide250a055d00d0b9e2f3786d1f737d5c61cb3cc8