Merge change 25785 into eclair

* changes:
  Fix http://b/2126318 (density test fails due to wrong-size asset stripping)