Merge "Remove dalvik/libdex"
am: 8843541a21

Change-Id: Ic23df73202175da9be52e8ebc79a197234727a77