Merge "Pass down apex image if profilebootimage is enabled" am: 5f8d418980 am: 38b912fe51
am: 062f3899ac

Change-Id: I55c8e80de79be7d4f30d4080fb8b8609c6423e9f