Changes to build kitkat

Change-Id: Ia25d3b0fdac1b7ea5c4b7dbe50c0049c3be3cbb1