Times out on 32bit target/host for 132-daemon-locks-shutdown test. Bug: 22720414 This reverts commit 356412e2. Change-Id: I5ab3a09e88a5ad8c306a27d2606ecbecc80b9326