Merge "ART: remove nested include in arch_test"
am: eecf60d

* commit 'eecf60d51b481647c8508f22b3d6ce437773ea0c':
  ART: remove nested include in arch_test