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

Change-Id: Iee9a4f6337c7997c958a082670d667eda96c22c9