Merge "Specify no resource_dirs for SystemUI"