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

Change-Id: I2f2fd095a77726c62ea7f557a7ed3b5844691bf5