Merge "docs: Added Lint into Android Training and removed Layoutopt." into ics-mr1