Merge "ART: Fix Main.isAotCompiled"
am: 8e8f5e3b45

Change-Id: Ic436d4a0814f29d2127ce52a1d81cd6c9ee5ae6e