Merge "Remove embedded launcher from repack_super_image" am: b2149885b0 am: c0fb152741

Change-Id: I5e0364b706e40a01cb1f808f9a05d1b7fec7f451