Merge "Correctly set oat class status after initializing" am: 19a4d0f01f
am: 8dbe954112

Change-Id: Ibc9b25b8766827577182443b00a9b5ff21af2353