Merge "sthal: using kernel header" into qt-r1-dev
am: 47893b63fe

Change-Id: I311bb8665331bb89216bf2e8734d23857dfbca0e