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

Change-Id: I7c2f449ae6ef961fd13b535bde6a7d34846feb4a