[automerger skipped] Merge "Copy "current" artifacts to new directory structure." into stage-aosp-master
am: 887a6dc304  -s ours

Change-Id: I16d6bd501c39d69cdf2e46ce6674a5b657481920