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

Change-Id: I2231d9168cba51acae93adcad8aa793a1806e98e