Revert "Switch to kitkat branch"

This reverts commit c970a1c25f10adc443e056d824da0781af0c2570.

Change-Id: I2c55cfacc4578c07bc04b31ae497f219af4eec93