Update manifest stuff for "kitkat" branch