Merge meta-sunxi master