Put system stub in 'system_N' directory when finalizing.
am: 934777cff0

Change-Id: I58baec3ae69b6b84486ba75701831d7acb004068