Merge "Add localonly= to prop duplicatefiles and imageinfo"