merging aosp 4.4.1