Merge "Use libdexfile_support_static only for the simpleperf NDK binary." am: 9acc37960f

Change-Id: Ic7ba92c19e0dd32910f62cc8884e26a46224f912