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

Change-Id: I6d3784ec69a8300b7aab6c8c13e727ab3f3936de