Merge "Avoid ThreadStress timeout with art-read-barrier-table-lookup." am: f95054f489
am: 54f60d6da7

Change-Id: Ib7e6ec12402a3644583e21fed23ecb2677891f61