Merge "docs: move Android Design from static HTML to JD" into ics-mr1