Fix source code after merge with softwinner