Merge "Remove dalvik/libdex"
am: 8843541a21

Change-Id: I38733deee098a01033d82cb045fc888a9ea4e618