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

Change-Id: Idc1fffd0c20dc1e667b974b558daf6770f1c3190