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

Change-Id: I2a5be68d73a64374ac67f10f636505b5d3244d7e