Merge "stop including rootdir build.prop"