Update framework_base branch to chronos_kitkat

Change-Id: I3fece3bf9f8a2a4c45cd34c52e4a72a050495c7e