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

Change-Id: I4b724cef078bc735f4a55b4f8374dfc8a0033c1a