Merge "Use libdexfile_support_static to properly link in static libdexfile."