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

Change-Id: If9f87da2ee128b0c06d190a926b2d31752301906