martini: fix:display+touch#2

2314372037 wants to merge 3 commits intoAndroid4Lumia:martiniAndroid4Lumia/android_kernel_nokia_martini:martinifrom

2314372037:test2314372037/android_kernel_nokia_martini_3.4.0:testCopy head branch name to clipboard