Merge "libbinder: add hints to waitForService error"