Added Android annotations.
Merge branch 'master' into release