[automerger skipped] Merge "Copy "current" artifacts to new directory structure." into pi-dev-plus-aosp
am: baee24c235  -s ours

Change-Id: Ie737f9ed3cc6c5237f4ca975e783840e3be032c7