Merge change 4718 into donut

* changes:
  Fix sim-eng build and simplify previous lcd-density related patch