Merge "Relabel ro.build. properties"