Merge commit '16926bc4' into gingerbread-plus-aosp * commit '16926bc4': Remove obsolete variable "len" to avoid compile failed