Merge "ART: Fix missing include"
am: a2dfb0f481

Change-Id: Ib6fc34ea42d0865a854194bd2b7203e5ba8ed89d