Change-Id: I2e6085084682b04ef7973bc433214b5b3ab2da79
This reduces the tombstone down by 100K A follow-on cl will remove the unused resources from the tombstone build Bug: 17414014 Change-Id: I5d38811b17a5273ec726e750ab123e10e36cee04