Merge "ART: Fix missing include" am: a2dfb0f481 am: 1711753241
am: cfde347c47

Change-Id: Ib5a457c37bfcb38a931db1ba4ca773bfe33deac9