Merge "ART: Move simulator to art/"
am: 95caa2bea4

Change-Id: I6db72cd001939cfc0fbc25107251cb7456dc8d46