Merge "Check jclasses are actually classes in ti_redefine." am: fd14d48182
am: deff2c2238

Change-Id: I030d37f86a36eb3e0009f7ed3176900156b1c252