Merge "Fix ART build bustage."
am: ca66aac289

Change-Id: I4d6fb2d87fed529dabdb25519becefe289ddc4f3