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

Change-Id: I3098fa93bacf266b7bbe911cc89b3e1267bed4af