Merge "ahat: annotate char[] objects with their string values." into nyc-dev