Merge "Fix missing entry for the static libdexfile_support test in the gtest list." am: 0faaf9cd2f am: 95451b596a
am: 9e79386048

Change-Id: Iffcce2186376e60056ba3b1dad87ee32b37a97d1