This reverts commit29c294b2cf
. The deadlock in R8 was fixed, and the timeout causes problems when RBE is enabled and the R8 action gets stuck in a queue for 30 minutes. Bug: 207767452 Test: checkbuild Change-Id: Ia0c3826aea3288e9db3bdbd4955e1e16c0a38fe3 Merged-In: Ia0c3826aea3288e9db3bdbd4955e1e16c0a38fe3 (cherry picked from commita832a04db2
)