Merge "Specify no resource_dirs for SystemUI"
am: 347d6ff9f9

Change-Id: I0b752a641e5f74d7dac1017616553f464427e219