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

Change-Id: If7f70afee5f91c18cf7589fd858d2a09fd0368df