Merge "Reland "Add $(PRODUCT_OUT)/apex to the artifact path whitelist""
am: ea976a2780

Change-Id: I8d5d34cace0f9701b5be22356d084df3a522220b