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

Change-Id: Ifbd329e479ba447707d1a2a3a9492b5b9e48e331