Merge commit '483b20e5ae65495d841de1844d97d79fbc0c1866' into gingerbread-plus-aosp * commit '483b20e5ae65495d841de1844d97d79fbc0c1866': Doc change: Cleanup for licensing doc.
Merge commit '483b20e5ae65495d841de1844d97d79fbc0c1866' into gingerbread-plus-aosp * commit '483b20e5ae65495d841de1844d97d79fbc0c1866': Doc change: Cleanup for licensing doc.