merge from sunxi

merge from sunxi