DO NOT MERGE Make fixes to make sysui more customizable

Bug: 144567659
Bug: 145547127
Test: manual
Change-Id: I66a0a7794ecfcdddd47d28ee681c904f799c5928
2 files changed