Merge "Use new static target for libdexfile_support."
am: 612a6d6ba3

Change-Id: Iaca2a1c769598e1512f29b693b039b2446197f5b