Merge "Migrate finalized prebuilts to the new directory structure." am: c39642cce4
am: 8ce2023d18

Change-Id: I63943421adbb292bf477f6009c28bb44d249a5ff