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

Change-Id: I80d8517dae0d0275733e969ec1358713069039db