Changes to build kitkat

Change-Id: Ib60ca1e4949a0429455c6e4a9d914c81024b8ffe