Merge "Remove LOCAL_CTS_GTEST_LIST_EXECUTABLE" am: 0a2b8b5ba2 am: 7f904442d5
am: 7fc1dd5306

Change-Id: I990bc41c28970621207995d9762e64330e5ecb02