Merge "Rename Version::ANDROID_* to kVersionFeatureLevel* -- hal"