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

Change-Id: I497e3551ef5fa941124c5a7f77dff70cb76950f0