wip
Merge branch 'master' of github.com:fs/android-base