Merge "Fix a typo in CustomTabsClient javadoc."