Merge "Remove embedded launcher from repack_super_image" am: b2149885b0

Change-Id: Ibbf4cf81e94a00dc5618f64cc62fd030875fcfc9