couple more typo fixes
set version back to AOSP version