Change some usage of list.append to list.extend

In some places, we were appending a list to a list, when the idea was
to extend.

Change-Id: Ifb60fbd57796ec05ed104ff04d51f4d76193be40