Merge "ART: Fix mips build" am: 7b805e622a
am: e495a84efc

Change-Id: Ib672b8dae94e3d3d8b6b99c46d91fec01d1646fa