Fix BootImageProfile aggregation am: a64fb518a1
am: 67c4662809

Change-Id: I6af1e575e71f80ab7572de27c68a0e5149dda8ce