Merge "Put system_version in target_files.zip" am: 3838ae7e9b
am: 75a7a591ba

Change-Id: I24c3d03dd9c30ec67dc7f9231da392f811650b20