https://gerrit.paranoidandroid.co/#/c/4486/

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>
Merge remote-tracking branch 'aospa/kitkat' into kitkat