Merge "Fix boot image profile in make files" into oc-mr1-dev
am: b9cd7e6ade

Change-Id: I0723fb868816a3148b42367ea7261cc77ccb312b