Merge "Add version_defaults.mk to be a prerequisite of build.prop"