Merge "remove rootdir build.prop"