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

Change-Id: I827752500fbb617ae23513610121a6329ba06ebb