Fix building on 4.4

Change-Id: I85030de3dea5f2d1a187cf2ced9517b3c820266a
Merge branch 'cm-11.0' into somex-4.4