Merge "Refine build.prop related properties"