am 6a62de22: am 954b358a: am 26f193da: am bb68c13a: Changes to support smaller email tombstone apk size

* commit '6a62de22e14b9b01274f14aacfcbf968a7da39dc':
  Changes to support smaller email tombstone apk size