Merge "Add missing build.prop related properties"