Add Android components

* build-tools-21.0.2
* android-21
* android-20
Merge branch 'ha-feature-android-updates'

Conflicts:
	changes.md