Merge "ART: Fixing build breakage."
am: 679e38bad5

Change-Id: I306da202445fc3d6755f764f0de202b5b0101da4