Merge with sunxi-v3.4.79-r1.
Sunxi Release 3.4.90+