Support dist-ing the userdatatarball am: bee409ba50
am: 932a406948

Change-Id: Ifd75cef28ff627c0f52d43c31a5dc376f9d7703d