Fixes for proper build (fixes of theme engine patches) on 4.4.3

Change-Id: I97bfe256e0787e9746c038c35e059141e3b9b656