Merge commit '44dcf29d' into gingerbread-plus-aosp * commit '44dcf29d': Add include guards to avoid multiple definitions.