Merge "ART: Fix Main.isAotCompiled" am: 8e8f5e3b45 am: 9c1e1dcb45
am: 15d9f72743

Change-Id: I3e295389585c9629f7d9838ff83072dd8a86b8d7