Fix build for u8500 devices
Fix build for u8500 devices
Merge remote-tracking branch 'upstream/kitkat' into kk44