Merge "Fix the build error in aarch64" into tizen