DO NOT MERGE Make fixes to make sysui more customizable
am: 731dafbd43

Change-Id: Ib69c58fff4543022e8c1f4b9c057ca5e5e6e68d8