Fix build errors on KitKat (cm11) branch

Change-Id: If999d7fcdd7fb85e5c9dc92e702f63d27e9e70b0