For ds builds only, emit a separate metadata file for samples only. am: d3a6874647
am: 0bf95683d1

Change-Id: I21b2d2d830ad62049d83ad128da8ef3a79986685