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

Change-Id: I7ae56a2d86b5f8d4c8258ce6a2b4131610a38eca