Merge "docs: update Android docs build to include API 22, Android 5.1" into lmp-mr1-dev