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

Change-Id: Iea102f2b6378434eba75d234d2e36b1b0075667a