Merge change 4565 into donut

* changes:
  Allow the qemu.sf.lcd_density property to override the value of ro.sf.lcd_density