Merge "Fixing gradle build for SystemUI"