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

Change-Id: Ieae6c1eb05df24e052e4021354febc3aa4a66cb0