Switch to kitkat branch

Change-Id: I956c0d7084f6217a88710836b5ba19d919033b22