Merge "Fix build file such that CarSystemUi can be easily extended"