Merge "Use new static target for libdexfile_support."