Merge "Add build.prop to factory ramdisk"