Switch to android 21
Merge branch 'master' of github.com:kvj/Lima1Common into HEAD