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

Change-Id: If1238f081fb3bae5649f59f2d865340544c8749a