Merge "Add build.prop to factory ramdisk" into ics-aah