Merge "AccessibilityNodeInfo shouldn't touch extras." into nyc-dev