Merge "Revert "Allow 2.2.3 for Build.VERSION"" into froyo