Bug 823900 - Include Android version number on all Android builds and tests. r=?