Merge "libbinder: limit visibility of test ifaces"