Merge "Fix SDK docs build." into gingerbread