Merge "Made art/runtime/arch/stub_test.cc compile with -O2 again." am: db11e7ecc9
am: bb4977a8e4

* commit 'bb4977a8e4bcf2527571577ce12d25396c199f9c':
  Made art/runtime/arch/stub_test.cc compile with -O2 again.