Merge "Must use libdexfile_support_static in a static executable."
am: 4cbf095493

Change-Id: Iea8f667a7917ee92edf1413571c6493f477b0951