Merge "sdk: Update dx to version 1.13, which supports dex file version 038"