Merge "Doc change: escape angle brackets in javadoc comment." into gingerbread