Merge "Use libdexfile_support_static to properly link in static libdexfile."
am: 3f98c7064d

Change-Id: I9ce7fdb934933067f2f3e53fb6ff9029fd4ff224