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

Change-Id: Ib01d1fa4ed6f082fa115f3a0df8f160bb0499e8b