Merge with sunxi-v3.4.90-r1