Merge "Add system.prop to specify lcd_density"