Merge "Fix boot image profile in make files"
am: 71f622e247

Change-Id: Iceb0a45af68573116681cca05c1f400ac156b596