Merge "Add more cleanspecs for the property files, fixing ro.secure."