This reverts commit fe210708. Reason for revert: Segfaults when CC is not enabled. Bug: 112187497 Change-Id: I9757097981a8120d893b0dbbd630ac4a87090a1d Test: TreeHugger