merge in klp-release history after reset to klp-dev
Merge branch 'aosp4.4_r1.1' into HEAD