Add Android version identifier
Merge branch 'master' into merge-2.064