Merge "Fix ART build bustage." am: ca66aac289
am: 7477018203

Change-Id: I6b759b13da0c4efbdfd700ca53cb0372c5c9e7db