[automerger skipped] Merge "DO NOT MERGE Make fixes to make sysui more...
[automerger skipped] Merge "DO NOT MERGE Make fixes to make sysui more customizable" into qt-qpr1-dev am: 480ea64a am: 20197c69 -s ours
am skip reason: subject contains skip directive
Change-Id: I14f58e135630351f97ffa7211344b1c5f29e21a2