Merge "Support dex version 38 in smali" am: bda1c3d6e4
am: 04ae4cc3fc

Change-Id: I08456051806186ea64a319c9882d40503a83e560