Bring current version number inline with aosp