Merge "binderSafeInterfaceTest: avoid zombie"