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

Change-Id: I70a9f6374a4a6cac5018a8335d8aa5b8193b92b3