Merge "Build:use is-android-codename instead of is-flavor"