Merge "Fix build file such that CarSystemUi can be easily extended" into qt-qpr1-dev
am: c2327e547b

Change-Id: I960535c3900069ce4b5980e499eb03ae1db8d318