Fix common out folder not being a common

Change-Id: Ia1e9b8ac98a03704300c73ee0addef22e42afc48