Merge "Copy "current" artifacts to new directory structure." into pi-dev-plus-aosp