Fix build

This fixes building SystemUI after merging this: http://gerrit.aokp.co/#/c/13236/

Change-Id: I52ee26c09ff0fd8d6dab88dfb436794e9319d13d
Signed-off-by: Dirk Rettschlag <dirk.rettschlag@gmail.com>
Merge remote-tracking branch 'cm/jb-mr2' into jb-mr2