This reverts commit 33b9bb81.
Bug: 149802360
Reason for revert: Test is hopefully fixed
(cherry-picked from commit ac3eecfd)
Test: atest BootImageProfileTest
Merged-In: Ifc99b98d0b438f5c0d7ae29a9046c4fc5fe2cf21
Change-Id: Ifc99b98d0b438f5c0d7ae29a9046c4fc5fe2cf21