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

Change-Id: I9a9afc8ad13e90e427c645262941bde1c131263a