Merge branch 'kk' of https://github.com/CarbonDev/android_frameworks_base into WIP

Change-Id: I2ac52d96a12e7a911f02acbcc48c5bd440f291ec
Move OctOS Easter egg strings to cr_strings

Change-Id: I043a311443854958f56e240a9582eff3a40fa0f8