Revert "Use javax.inject.Inject instead of com.google.inject.Inject" This reverts commit ecb113bf38a3903810c6aa47076018ff1b34e92c. The same change was also reverted in Gerrit core with the 1c48a7ee1c. Change-Id: I454a72d01ef602ef1fa5e0cd58f4e77435ae5890