Fix BootImageProfile aggregation
am: a64fb518a1

Change-Id: I581415a1dd40d4caedda58840344a7935a06049c