Squash aosp kitkat-release into kk4.4

Change-Id: I75c1b8c852bc27beb758217561f5a6759ca1b87e