REASON: Buildbots are having jack issues This reverts commit 152ee552. Change-Id: I650fe1a94f1b97c14a689599703498506dd70b23