Merge "Update version number." into dalvik-dev