Merge "Create static archives in temporary file" am: 2eca5d30df
am: 0cbb3086de

Change-Id: Ie76b3d7395fd1fce54d35dcf98d9c3873fa359d8