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

Change-Id: I3dd4dafbb7fdeba7422dd7364fb27d5cb669f998