Merge "Doc change: clean up droiddoc (cs) macros." into gingerbread