Merge "Enable some redefinition run-tests in CTS"
am: 66f43b988a

Change-Id: Ic0db769c4d17ed3996ac653c77fb136ed5278c57