Kitkat ahead

Change-Id: Ibce2ea01b490d4c56ecb5395e624090409d1b7cb
Fix build on 4.4

Change-Id: I549ef451df979d13cfeade1983bf44406c1111f4