Support dist-ing the userdatatarball
am: bee409ba50

Change-Id: I659273a8d5f085ca1f3e5291b028847ee58665d4