This reverts commit 05ca7c87. Reason for revert: b/195644067 Flaky failure with "missing in.jar" error. Change-Id: Id2d6452de1e43951bc58f0bfb8e20d5ad65ce830