This reverts commit 83dbbbc7. The build bot failure is due to wrong configuration. Bug: 34038136 Change-Id: I28ab2618005ed4fb6ea2c7e95d51ee3622d6580d