Merge "mako: display: update lcd initial code." into android-msm-mako-3.4-wip