Merge commit 'c43f4784253f49189f20d131508bdb23da113197' * commit 'c43f4784253f49189f20d131508bdb23da113197': Use the droidcore goal with dist-for-goals.
Merge commit 'c43f4784253f49189f20d131508bdb23da113197' * commit 'c43f4784253f49189f20d131508bdb23da113197': Use the droidcore goal with dist-for-goals.