Fix build

Doh!

Change-Id: Ia2c03cf8dad334eb2106968a31dded0eca900740
Signed-off-by: Dirk Rettschlag <dirk.rettschlag@gmail.com>
Merge remote branch 'aokp/kitkat' into kitkat