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

Change-Id: Icb8a5915b1649d2abe9b5ee7080842bf547859b2