This reverts commit d2fd0b0a.
After fixing the dependency problem, this should not break the build.
Test: Local build tests.
Bug: b/111798740
Change-Id: If2233e9c12dc3b5e2e3421746c32a57e74ae7206
1f399cdc
After you've reviewed these contribution guidelines, you'll be all set to
contribute to this project.
