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

Change-Id: I34bf4359ad588c9432d65e372bf7384c2488b471