Support dex version 37

Bug: 27538761
Bug: 27809626

(cherry picked from commit 42b618267da37587f794411f07a2c316a5fde3eb)

Change-Id: Iaa4346295451147af549abb71655caae381cd867
2 files changed