merging from stock 4.2 allwinner a13