Merge "Add an 'art-preopt' test target configuration." am: da7d1bc58e am: 507b60bf4e
am: 7748c80996

Change-Id: Id1db26c8f42c134148db7706a91e7251342c894d