Merge commit 'c6282977180c220b1a68c23a328e7d75a11963ab' * commit 'c6282977180c220b1a68c23a328e7d75a11963ab': Fix sim-eng build and simplify previous lcd-density related patch
Merge commit 'c6282977180c220b1a68c23a328e7d75a11963ab' * commit 'c6282977180c220b1a68c23a328e7d75a11963ab': Fix sim-eng build and simplify previous lcd-density related patch