Merge "Version number change for AOSP master"