Merge "Fix boot image profile in make files"