Reland^2 "Always put the framework profile in the boot image location." am: ed1f531085

Change-Id: I151a2be988087ed425e41204fa833ae5ba5089af