Fix BootImageProfile aggregation am: a64fb518a1 am: 67c4662809
am: 487da7fb35

Change-Id: Ib06b0e3b24bf472e4ccf5518832bacada661ccab