[automerger skipped] Merge "Copy "current" artifacts to new directory structure." am: 22e5d22cf5  -s ours
am: 333e229b8c  -s ours

Change-Id: Iab5c2328c83c522dd8bbd3c2c1cc4366ccc32307