Merge "Use the non-LTO/PGO hwbinder in recovery_component_test" am: 87e2fc3831
am: 30b4ad5c56

Change-Id: I47cfc34b09f83025dc1d6802eb9208774384e4bc