Merge "binderSafeInterfaceTest: over maxFds, not double"