Merge "dx: Regenerate expectations for 137-dexmerger-dex38" am: 3f3f70fb4d
am: f82764a847

Change-Id: I0137121403cf5f53a2f712ca5956b7f066cfe337