Merge MK2
Merge MKG and other jf aosp 4.4