Add even more sanity checks to ti_redefine.cc and skips
am: baf938f331

Change-Id: I5f9ca8e1a8c59e9bbc35f644d9c7bb3014b23903