merge android4.4.2_r2
update